Skip to content

fix(@angular/cli): exclude node_modules while take account for os specific path separators (#6870) #7158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Jul 31, 2017
Merged

fix(@angular/cli): exclude node_modules while take account for os specific path separators (#6870) #7158

merged 2 commits into from
Jul 31, 2017

Conversation

christianscharr
Copy link
Contributor

@christianscharr christianscharr commented Jul 27, 2017 •
edited
Loading

fix(@angular/cli): use relativ path instead of regex to exclude node_modules (#6870)

@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.

  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If your company signed a CLA, they designated a Point of Contact who decides which employees are authorized to participate. You may need to contact the Point of Contact for your company and ask to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the project maintainer to go/cla#troubleshoot.
  • In order to pass this check, please resolve this problem and have the pull request author add another comment and the bot will run again.

@christianscharr
Copy link
Contributor Author

I signed it!

@googlebot
Copy link

CLAs look good, thanks!

@christianscharr christianscharr changed the title (fix@angular/cli): use relativ path instead of regex to exclude node_modules (#6870) fix(@angular/cli): use relativ path instead of regex to exclude node_modules (#6870) Jul 27, 2017
filipesilva
filipesilva suggested changes Jul 31, 2017
View reviewed changes
packages/@angular/cli/tasks/eject.ts Outdated
@@ -287,7 +287,7 @@ class JsonWebpackSerializer {
return v;
} else if (typeof v == 'string') {
if (v === path.join(this._root, 'node_modules')) {
return this._serializeRegExp(/\/node_modules\//);
return this._relativePath('process.cwd()', 'node_modules');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We actually cannot rely on process.cwd() because the commands can be called from subfolders.

Can you replace this to this._serializeRegExp(/(\\|\/)node_modules(\\|\/)/) instead please? That way it supports both separators. This is also important for when the project is being ran in both Windows and OSX/Linux.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally makes sense this way... Will try it locally and then do the requested change

@filipesilva filipesilva self-assigned this Jul 31, 2017
@christianscharr christianscharr changed the title fix(@angular/cli): use relativ path instead of regex to exclude node_modules (#6870) fix(@angular/cli): exclude node_modules while take account for os specific path separators Jul 31, 2017
@christianscharr christianscharr changed the title fix(@angular/cli): exclude node_modules while take account for os specific path separators fix(@angular/cli): exclude node_modules while take account for os specific path separators (#6870) Jul 31, 2017
@filipesilva
Copy link
Contributor

LGTM, thanks. The CI failed but it seemed to have been a fluke. I've restarted it.

@filipesilva filipesilva reopened this Jul 31, 2017
@filipesilva filipesilva merged commit 70cf514 into angular:master Jul 31, 2017
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@filipesilva filipesilva filipesilva approved these changes

Assignees

@filipesilva filipesilva

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@christianscharr @googlebot @filipesilva